-
Notifications
You must be signed in to change notification settings - Fork 49
Conversation
Can you squash these commits into 2-3 logically fitting commits once ready so that we have a cleaner commit history? Also we have to again decide what we want to do along the still unpublished 3.0 release, see #74. Would you want to give this a try to integrate the 3.0 release into the VM along the changes here on a relatively short-term basis (sorry, I still don't have the capacity, this will get better from mid-January onwards) - so until early next week or so? Or should we backport these changes analogue to what Sina did here #77 for the |
Re commits: absolutely. In fact I can rebase from master and just add the relevant commits on top of it. I imported this PR from the old one and GH web interface messed with the history. I will look into the history and will try to have a solution by early next week. Thanks for being responsive! |
11747f5
to
f7f9845
Compare
f7f9845
to
6aeed94
Compare
@@ -46,7 +46,7 @@ | |||
"homepage": "https://github.com/ethereumjs/ethereumjs-block#readme", | |||
"dependencies": { | |||
"@types/bn.js": "^4.11.5", | |||
"ethereumjs-common": "^1.3.0", | |||
"ethereumjs-common": "^1.5.0", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
1.5.0 has the definitions for HF Muir Glacier
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, will approve and merge, thanks!
Had again another look at the commit history, and I would still have a tendency to do this as a Eventually we even want to do this a bit on a quick-and-dirty level and not include all these CI changes on these old branch but just take/cherry-pick the 2 out of 3 content commits from this PR and put them on top of the branch and see if the Travis Node tests are working together with a confirmation note from along PR submission that browser tests have been successfully run locally. @evertonfraga What do you think? Does this make sense? Can you then prepare a PR accordingly? |
Makes sense, I’ll prepare them on Monday. |
This PR delays the difficulty bomb, as specified by https://eips.ethereum.org/EIPS/eip-2384.
Should be tested in conjunction with ethereumjs/ethereumjs-common#75.
Closes #79.